Bring 0305a changes from branch to trunk for 1.3.5 release. (moves KML icons)

diff --git a/kml.c b/kml.c
index 7e3ed321b5f438093d81f61a52f26d3a7b950860..3f99db5c6e6f94efa4937a91d8f513930a64136c 100644 (file)
--- a/kml.c
+++ b/kml.c
@@ -80,6 +80,9 @@ static int do_indentation = 1;
 #define TD(FMT,DATA) kml_write_xml(0, "<tr><td>" FMT " </td></tr>\n", DATA)
 #define TD2(FMT,DATA, DATA2) kml_write_xml(0, "<tr><td>" FMT " </td></tr>\n", DATA, DATA2)
 
+//  Icons provided and hosted by Google.  Used with permission.
+#define ICON_BASE "http://earth.google.com/images/kml-icons/"
+
 static const char kml22_hdr[] =  
        "<kml xmlns=\"http://earth.google.com/kml/2.2\"\n"
        "\txmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n";
@@ -138,16 +141,16 @@ struct {
        int freshness;
        char *icon;
 } kml_tracking_icons[] = {
- { 60, "http://www.gpsbabel.org/apps/earth/youarehere-60.png" }, // Red
- { 30, "http://www.gpsbabel.org/apps/earth/youarehere-30.png" }, // Yellow
- { 0, "http://www.gpsbabel.org/apps/earth/youarehere-0.png" }, // Green
+ { 60, ICON_BASE "youarehere-60.png" }, // Red
+ { 30, ICON_BASE "youarehere-30.png" }, // Yellow
+ { 0,  ICON_BASE "youarehere-0.png" }, // Green
 };
 
-#define ICON_NOSAT "http://www.gpsbabel.org/apps/earth//youarehere-warning.png";    
+#define ICON_NOSAT ICON_BASE "youarehere-warning.png";    
 #define ICON_WPT "http://maps.google.com/mapfiles/kml/pal4/icon61.png"
-#define ICON_TRK "http://www.gpsbabel.org/apps/earth/track-directional/track-none.png"
-#define ICON_RTE "http://www.gpsbabel.org/apps/earth/track-directional/track-none.png"    
-#define ICON_DIR "http://www.gpsbabel.org/apps/earth/track-directional/track-%d.png" // format string where next arg is rotational degrees.
+#define ICON_TRK ICON_BASE "track-directional/track-none.png"
+#define ICON_RTE ICON_BASE "track-directional/track-none.png"    
+#define ICON_DIR ICON_BASE "track-directional/track-%d.png" // format string where next arg is rotational degrees.
 
 #define MYNAME "kml"
 

diff --git a/reference/earth-expertgps.kml b/reference/earth-expertgps.kml
index 946c8f263149966c582b42391d2d760fc5b82cf5..456a26b194c993847ec31b1bc6f237b8aa10e980 100644 (file)
--- a/reference/earth-expertgps.kml
+++ b/reference/earth-expertgps.kml
@@ -7,7 +7,7 @@
     <Style id="route_n">
       <IconStyle>
         <Icon>
-          <href>http://www.gpsbabel.org/apps/earth/track-directional/track-none.png</href>
+          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -16,7 +16,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://www.gpsbabel.org/apps/earth/track-directional/track-none.png</href>
+          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -34,7 +34,7 @@
     <Style id="track_n">
       <IconStyle>
         <Icon>
-          <href>http://www.gpsbabel.org/apps/earth/track-directional/track-none.png</href>
+          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -43,7 +43,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://www.gpsbabel.org/apps/earth/track-directional/track-none.png</href>
+          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>